projects / xen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 44085c9 90a17e6)
bitkeeper revision 1.1473 (428d01b2u1JOg4f95CAjC08qwbmHCg)
authorakw27@arcadians.cl.cam.ac.uk <akw27@arcadians.cl.cam.ac.uk>
Thu, 19 May 2005 21:14:26 +0000 (21:14 +0000)
committerakw27@arcadians.cl.cam.ac.uk <akw27@arcadians.cl.cam.ac.uk>
Thu, 19 May 2005 21:14:26 +0000 (21:14 +0000)
Merge arcadians.cl.cam.ac.uk:/auto/groups/xeno-xenod/BK/xeno.bk
into arcadians.cl.cam.ac.uk:/auto/anfs/nos1/akw27/xeno-clone/xeno.bk

1  2 
tools/python/xen/xend/Blkctl.py patch | diff1 | diff2 | blob | history
tools/python/xen/xend/server/blkif.py patch | diff1 | diff2 | blob | history

diff --cc tools/python/xen/xend/Blkctl.py
Simple merge
diff --cc tools/python/xen/xend/server/blkif.py
Simple merge
Unnamed repository; edit this file 'description' to name the repository.